From 5cc85a5a63ff87982ebb7625eec386c966d7cc63 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 Feb 2004 23:14:37 +0000 Subject: [PATCH] Support mnemonic_activate here as well. Fri Feb 6 00:15:38 2004 Matthias Clasen * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_mnemonic_activate): Support mnemonic_activate here as well. * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Focus the button, not the tree_view. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkcombobox.c | 2 +- gtk/gtkcomboboxentry.c | 18 +++++++++++++++++- 7 files changed, 58 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2cc5e172e..1d5a3d5b97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Feb 6 00:15:38 2004 Matthias Clasen + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_mnemonic_activate): + Support mnemonic_activate here as well. + + * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Focus + the button, not the tree_view. + Thu Feb 5 23:48:19 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Add this diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d2cc5e172e..1d5a3d5b97 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Feb 6 00:15:38 2004 Matthias Clasen + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_mnemonic_activate): + Support mnemonic_activate here as well. + + * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Focus + the button, not the tree_view. + Thu Feb 5 23:48:19 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Add this diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d2cc5e172e..1d5a3d5b97 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Feb 6 00:15:38 2004 Matthias Clasen + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_mnemonic_activate): + Support mnemonic_activate here as well. + + * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Focus + the button, not the tree_view. + Thu Feb 5 23:48:19 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Add this diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d2cc5e172e..1d5a3d5b97 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Feb 6 00:15:38 2004 Matthias Clasen + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_mnemonic_activate): + Support mnemonic_activate here as well. + + * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Focus + the button, not the tree_view. + Thu Feb 5 23:48:19 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Add this diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d2cc5e172e..1d5a3d5b97 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Feb 6 00:15:38 2004 Matthias Clasen + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_mnemonic_activate): + Support mnemonic_activate here as well. + + * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Focus + the button, not the tree_view. + Thu Feb 5 23:48:19 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_mnemonic_activate): Add this diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index f52a441689..c666578e8e 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2834,7 +2834,7 @@ gtk_combo_box_mnemonic_activate (GtkWidget *widget, { GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - gtk_widget_grab_focus (combo_box->priv->tree_view); + gtk_widget_grab_focus (combo_box->priv->button); return TRUE; } diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index c5f1965e1e..a21e73f823 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -51,7 +51,8 @@ static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_b gpointer user_data); static void gtk_combo_box_entry_contents_changed (GtkEntry *entry, gpointer user_data); - +static gboolean gtk_combo_box_entry_mnemonic_activate (GtkWidget *entry, + gboolean group_cycling); enum { @@ -93,11 +94,15 @@ static void gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass) { GObjectClass *object_class; + GtkWidgetClass *widget_class; object_class = (GObjectClass *)klass; object_class->set_property = gtk_combo_box_entry_set_property; object_class->get_property = gtk_combo_box_entry_get_property; + widget_class = (GtkWidgetClass *)klass; + widget_class->mnemonic_activate = gtk_combo_box_entry_mnemonic_activate; + g_object_class_install_property (object_class, PROP_TEXT_COLUMN, g_param_spec_int ("text_column", @@ -321,3 +326,14 @@ gtk_combo_box_entry_get_text_column (GtkComboBoxEntry *entry_box) return entry_box->priv->text_column; } + +static gboolean +gtk_combo_box_entry_mnemonic_activate (GtkWidget *widget, + gboolean group_cycling) +{ + GtkComboBoxEntry *entry_box = GTK_COMBO_BOX_ENTRY (widget); + + gtk_widget_grab_focus (entry_box->priv->entry); + + return TRUE; +} -- 2.30.2